fix lint issues
Merge pull request #328 from bstell/master

fix lint issues