Merged pull request #12 from bhy/T423.