Encodings are weird, but I think I got it now.
Merge branch 'master' of https://github.com/themad/hmpf into devel