Fix

Tested full working Quick Start version, ready to be improved, not
debugged :)) by developers community.