Merge pull request #50 from ProPercivalalb/master

Gimme updates!
Merge pull request #109 from chylex/master

Merge pull request #50 from ProPercivalalb/master