Storm 0.7.2

With commits from witlessbird, compatibility with Storm 0.7.2