Merge pull request #14 from steeef/lint

Linting fixes