Erwin Schens Merge pull request #1 from rubyconvict/patch-1