Merge pull request #24 from ProPercivalalb/master

Gimme updates!