Merge pull request #2 from jleverich/master

pull
Merge pull request #3 from jleverich/test2

Merge pull request #2 from jleverich/master