Bugs fixed
Merge branch 'master' of https://github.com/jcastano-xk/xumak-rfp