applying some encoding fixes to address issue 7, it looks like some general adjustments and refactoring should be done
Merge branch 'iss7'