Começando issue #41
Merge branch 'master' of https://github.com/4Soft/SAFIRA