bringing things up to date
Merge branch 'master' of https://github.com/jhollist/bc
bringing things up to date