Merge pull request #98 from nealcpeters/styling

Styling
Merge branch 'master' into styling