Merge branch 'master' of github.com:jafuentest/JOINCIC