Merge branch 'develop' into release
Merge pull request #25 from sfhatcompany/release

Merge branch 'develop' into release