Encoders added
Merge origin/master