Merge pull request #307 from buddycloud/dev-candy

Merge from dev-candy
Merge pull request #308 from buddycloud/master

Merge pull request #307 from buddycloud/dev-candy