Merge pull request #18 from ProPercivalalb/master

Gimme updates!
Fixed grasshoppers
Merge pull request #42 from chylex/master

Fixed grasshoppers