merge changes from nathanmarz/storm