Merge pull request #26 from ProPercivalalb/master

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

Merge pull request #26 from ProPercivalalb/master