Added support for Storyboards - Fixes #5