merge changes from nathanmarz/storm master