Fix #14
Fixing Encoding