Fixed some code errors
Merge branch 'master' of https://github.com/alcideschaux/arid1a.utuc