Merge branch 'master' of https://github.com/raviperi/storm into STORM-2127