weshoke Merge pull request #19 from tiagmoraismorgado/patch-1