With tests, verified against the stdlib. Fixes a todo, and fixes #939.
Attach a file by drag & drop or click to upload
