bugs and updates
Merge branch 'master' of https://github.com/tamengual9/adcau2.0-dv