A few bug fixes, problems with charset
Merge branch 'master' of https://github.com/martinexner/dcl