Adopt a pull request #3 from qthru/master