Merge pull request #23 from nealcpeters/neal

Neal
Merge branch 'master' into neal