- bug with unicode variation replacement
- added comments
Merge remote-tracking branch 'origin/master'