Merge branch 'feature/default_encoding' into 'master'

Re added the default encoding value to allow platform not to use the system's locale

See merge request !1