Updated to fix utf-8 issues