Pushed more things to be inheritented
Merge branch 'master' of https://github.com/paarseschep/barrocIt.git