Merge pull request #58 from ProPercivalalb/master

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

Merge pull request #58 from ProPercivalalb/master