Merge pull request #29 from joaosagrath/patch-1