Merge pull request #3 from jtimon/master