Refactoring and bug fixxing
Merge branch 'master' of https://github.com/Ocirina/CRIA