Started a bugfix on Encoding problems