fixed conflicts
Merge branch 'eusonlito-master'