Revert "Merge pull request #4 from mirego/feature/composition-not-inheritance"

This reverts commit a653ef0915d2ea60f1a89cdf8c027604d5993dab, reversing
changes made to 1cabc3cacdf3ee14ee486f809fb1fc94e84306a7.