restructured scan and did some other stuff.
Merge branch 'master' of https://github.com/dwtj/mars-rover