Fix unicode error #483
Add new author
Merge branch 'master' into pr/484

Conflicts:
	AUTHORS