Fix encoding crashes when reading files#22

itzexpoexpo wants to merge 2 commits into

mschwager:mastermschwager/cohesion:masterfrom

itzexpoexpo:masteritzexpoexpo/cohesion:masterCopy head branch name to clipboard