Decorator Pattern
Merge branch 'master' bugfix into develop