Merge pull request #5 from ambitioninc/master

Merging release back into develop
Merge pull request #7 from ambitioninc/develop

Master release back into develop