Merge pull request #71 from abnerescocio/patch-1