Merge branch 'STORM-1040' of https://github.com/haohui/storm into STORM-1040