Merge pull request #14 from pepijnve/master

Simplify code by replacing inheritance with module inclusion