New lint and fixes accordingly
Merge pull request #25 from ferrix/lint

New lint and fixes accordingly