Merge pull request #27 from ambitioninc/master

Sync master and develop