Merge pull request #66 from ppizarro/master