Feature 123 novotes

Fix for issue #123, including tests.