linting
linting
Merge pull request #9 from darktim/master

Heavy linting