fixed character de/encoding by switching to ISO-8859-1 (hopefully)
Merge remote-tracking branch 'upstream/master'

neccesary