POC-6 review and adjustments
adding fix
Merge pull request #1 from romanman/develop

POC-6 review and adjustments