code review
fix conflicts
Merge pull request #176 from anacarolinats/master

Code review