linting
Merge pull request #51 from oxilion/linting

linting