linting
Merge pull request #361 from bstell/master

linting