Merge pull request #45 from ProPercivalalb/master

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

Merge pull request #45 from ProPercivalalb/master