Same commit as on the bc repo
Merge pull request #1 from collingsr/master

Same commit as on the bc repo