Merge branch 'clean_up'
inheritance changes, before refaktoring
Merge branch 'master' into better_filtering
Merge branch 'better_filtering'
Merge branch 'master' of https://github.com/janpolowinski/rvl