Merge pull request #2 from jleverich/master

pull