Merge pull request #21 from ProPercivalalb/master

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

Merge pull request #21 from ProPercivalalb/master