Applying quickstart changes to kborchers' branch, to keep the history of the demo