Merge pull request #40 from sfhatcompany/release

Release
Merge branch 'develop' into release