fixed bug
Merge branch 'carlosmaster'