Fixes #16, Resolve encoding issues, Work in progress for #14