Fix minor issue with UTF8 + long names on OSX
Merge remote-tracking branch 'upstream/master'
Merge pull request #17 from kennydude/master

OSX Fix