Merge pull request #5 from ldurazo/master