Merge pull request #21 from ProPercivalalb/master

Gimme updates!