Merge pull request #1 from GigaBots/master

pull to bittelc
Merge pull request #21 from bittelc/master

Merge pull request #1 from GigaBots/master