Merge pull request #92 from buddycloud/develop

Merge develop to master
Merge pull request #93 from buddycloud/master

Merge pull request #92 from buddycloud/develop