Merge pull request #31 from RoboJackets/dev

Dev
Fix for bug #32