fixes #91
Merge pull request #108 from buddycloud/develop

Fixes #91