Merge pull request #26 from ProPercivalalb/master

Gimme updates!