Fixing to make people happy
Merge pull request #991 from psav/fix_lint

Fixing to make people happy