Merge pull request #3 from jmtodaro/master