added object for encoding
Merge branch 'lf-master' into localization
extended classes to use ObjectForEncoding
small changes to edit