Merge pull request #149 from lucas42/patch-1