Merge pull request #2 from mrquincle/master

Merge back to master
Merge pull request #8 from dobots/master

Merge pull request #2 from mrquincle/master