wip
Merge branch 'master' into bs-fork
Merge pull request #28 from crowdtap/bs-plugins

Bs plugins