Prefer include over class when possible
Merge pull request #4 from atomaka/bugfix/includes

Prefer include over class when possible