changed the cbm converter with a better mapping
Merge pull request #139 from RoanKanninga/master

Updated the CBM converter, now with a better mapping