Fixed encoding issues with quotes
Merge branch 'refactoring'