Merge pull request #324 from buddycloud/dev-candy

Updates from dev-candy