[#39] Improve handling for unicode strings
[close #39] Merge branch 'unicode-comments' into master

Conflicts:
	CHANGES