Merge pull request #2 from FarmBot/master

Merge to my git fork