Merge pull request #38 from ryanplusplus/robotCleanup

Thanks