Duplicated code fix issue #88
Merge remote-tracking branch 'github/luis2'
merge and resolution of conflict