Applying coding standards formatting
Merge pull request #157 from colegeissinger/master

Applying coding standards formatting