linting
Merge pull request #373 from bstell/master

linting