storm fixes
Merge pull request #1 from ahgittin/feature/storm

storm fixes