Merge refactorCombinados2 with issue_61

Close 61