linting
Merge pull request #357 from bstell/master

linting