styling
Merge branch 'master' into neal
Merge pull request #16 from nealcpeters/neal

Neal