squashed last 9 commits
Merge remote branch 'github_pbberlin_playground/master'