Merge pull request #45 from stephandev/master

Avoiding merge conflicts.
Bug fixes, improvements, storyboard linking.
Merge pull request #99 from mshamash/master

	Bug fixes, improvements, storyboard linking.