Use composition over inheritance
Merge pull request #4 from mirego/feature/composition-not-inheritance

Use composition over inheritance