Small update: Fixed a few bugs, changed chars to unicode decimal values.
Merge remote-tracking branch 'origin/master'