improvements
Merge branch 'master' of github.com:antoniopuero/uwc