Merge pull request #34 from ProPercivalalb/master

Gimme updates!