Merge pull request #1 from irvs/master

Master
Merge pull request #131 from robotpilot/master

Merge pull request #1 from irvs/master