roflores21 Merge pull request #71 from roflores21/patch-1