encoding set to utf8, shortened class name
Merge remote-tracking branch 'origin/master'