Merge pull request #23 from ProPercivalalb/master

Gimme updates!