Fixing merge conflicts created when merging pull request issue 73
Merge pull request #74 from carlosvillademor/fixPullRequest#73

Fixing merge conflicts created when merging pull request issue #73