Oops, previous commit closed #168, not #16

Closes #168