storyboard wins

or does it?
Merge pull request #123 from deebost/master

storyboard wins