Linted
Merge pull request #1 from kkoopa/master

Linted