Merge pull request #44 from ProPercivalalb/master

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

Merge pull request #44 from ProPercivalalb/master