Fixed some formatting
Merge pull request #246 from TekHus/master

Fixed some formatting
Merge pull request #742 from KevWright/master

Fixed some formatting