Lint
Merge pull request #1171 from mfalesni/linty

Lint