Fixing bugs
Merge branch 'master' of github.com:thepipster/nStorm