Closes #26 no answer from OP, manually merged + UTF-8