badboy Merge pull request #92 from esteve/patch-1 …