Fixes #94 and adds a test.

Yup. I wanted to be REALLY sure. :rabbit: