Fixed issue 18. REworking demo project