Updated to fix utf-8 encoding issues