Merge pull request #2 from mattmewton/master