fix
Merge branch 'final' of https://github.com/koikoiti/columbia_comercial into final