Test: see #8

Merge this branch back to master, please!