Fixes #36
Merge pull request #37 from CAPS-Robotics/dev

Fixes #36