Merge pull request #41 from angathorion/master

Fixes #40
Lints