Fixing #35
Merge branch 'master' of https://github.com/4Soft/SAFIRA