Fixed lint errors
Merge pull request #124 from stianjensen/lintified

Fixed lint errors