Merge pull request #2 from SaintsRobotics/master

Cleaning this up a bit