Issue 416

I added the new version and a test. This should solve Issue #416.