Merge pull request #33 from ProPercivalalb/master

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

Merge pull request #33 from ProPercivalalb/master