Fixed

Signed-off-by: shyeon.kim <kimseo@kth.se>
Encoder added

Signed-off-by: shyeon.kim <kimseo@kth.se>