Merge pull request #16 from feri/overhaul

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