Linting fixes.
Merge pull request #32 from brianpeiris/master

Linting fixes #32