Fixed some linting issues.
Merge pull request #151 from guywarner/develop

Fixed some linting issues.