Merge pull request #3 from rnavarro/master