Merge pull request #2 from JohnMHarrisJr/master