Bug fixes.
Code formating
Merge branch 'master' of https://github.com/Ocirina/CRIA