add import statement; utf8 encoding fix
Merge remote-tracking branch 'origin/master'