close #28
Merge remote-tracking branch 'origin/refactorCombinados2' into refactorCombinados2