Changed from inheritance to encapsulation
Merge branch 'master' of https://github.com/varkenvarken/SmallStuff