Small changes that resulted in some mess ups. Saving this version but rolling back to previous.
Merge branch 'master' of https://github.com/ncsurobotics/seawolf5