Updated to latest code base
Merge branch 'master' of https://github.com/webinos/webinos-utilities