Marge pull request #19