lucasviola Merge pull request #19 from thedudio/patch-1