Merge pull request #17 from alejandronanez/master

Updates.