[issue #1] final demo adaptions
Merge branch 'feature/1-framework-impl' into dev