Fix unicode

@SirCmpwn ready to merge, fixes #623