Merge pull request #28 from ambitioninc/develop

Merge pull request #27 from ambitioninc/master
Update version.py
Merge pull request #29 from ambitioninc/master

Sync develop and master