Added encoder setup
Merge origin/master