Issue #483

So far, this contains only a simple unit test for issue #483.