Merge pull request #27 from ambitioninc/master

Sync master and develop
Merge pull request #28 from ambitioninc/develop

Merge pull request #27 from ambitioninc/master