Merge  storm master code

Merge  storm master code on 2013-12-02