Merge pull request #142 from RoanKanninga/master

small bugfix for CBM convert/import
bug fixes, small style change
Merge pull request #143 from dennishendriksen/master

Data explorer bug fixes