Merge pull request #1 from GigaBots/master

pull to bittelc