Fixes #29
Merge branch 'master' of https://github.com/buddycloud/channel-directory