Non-utf8 character corrections
Additional systems
Merge pull request #16 from kfsone/master

Non-utf8 character corrections