Merge pull request #307 from buddycloud/dev-candy

Merge from dev-candy