linting
Merge pull request #360 from bstell/master

linting