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