lint
Merge pull request #26 from mremy/lint_pr25

lint