adding changes for CIO Demo
Merge branch 'master' of github.com:xalgorithm/commons-tweaks