Edits for language style
Merged master fixed conflict.
Merge pull request #190 from mdiephuis/master

Edits for language style