Merge pull request #6 from ldurazo/master