resolves #218
Merge branch 'master' of https://github.com/ButterFly-Broadcast/butterfly.git