Removed redundant else branch
Merge branch 'refactoring-for-unit-tests' of github.com:tartarini/MAF2 into refactoring-for-unit-tests