Merge pull request #192 from hunner/fix_lint