Fixed bugs and code refactoring
Merge branch 'master' of https://github.com/atrakeur/SIRES