Merge pull request #2 from ahilson2/master

Merge pull request #1 from ahilson2/master