.new() didn't seem as OO and I'm not sure what I was thinking
Merge branch 'master' into tests_doc