Linting
Merge pull request #14 from raphink/dev/linting

Linting