Lint
Merge pull request #1005 from psav/fix_lint

Lint