Updates based on suggestions by jdblischak
Merge branch 'master' of https://github.com/jainsley/bc