Merge pull request #4 from ldurazo/master