Fixed an error
Merge remote-tracking branch 'slipson/master'

and has improved movement. Test to come later
Merge remote-tracking branch 'aschin/master'
after pull from Adam 4/8/13