Merge pull request #1 from jmtodaro/master