Moved position control fix to motor class
Added support for screen-shot