Fixes #16
Merge branch 'master' of https://github.com/googaloo/Storybook