Merge pull request #14 from ProPercivalalb/master

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

Merge pull request #14 from ProPercivalalb/master