Merge pull request #37 from ProPercivalalb/master

Gimme updates!