fixes glome/cbc#15
Merge branch 'overhaul' of github.com:glome/cbc into overhaul