Merge Rover-83,84 changes
Merge pull request #3 from ramprakash-r/master

Merge Rover-83,84 changes