Merge pull request #22 from ProPercivalalb/master

Gimme updates!