Merge pull request #92 from buddycloud/develop

Merge develop to master