Sync project with gradle
Merge pull request #136 from gcurtis/sync-proj

Sync project with gradle