Merge pull request #2 from seivan/develop

Merge develop into master
Merge branch 'master' of github.com:seivan/SHTransitionBlocks