Fix lint issues
Merge pull request #1 from bimv/master

Fix lint issues