Merge pull request #57 from ProPercivalalb/master

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

Merge pull request #57 from ProPercivalalb/master