Merge pull request #2 from bruinrobotics/master

update