Removed conflicted code
Merge pull request #16 from juanfernandes/patch-2

Removed conflicted code