Fix for converting cp1252 strings to utf-16

Signed-off-by: Peter Atashian <retep998@gmail.com>
Merge branch 'master' of github.com:NoLifeDev/NoLifeStory