Issue 305

This should solve Issue #305. I only added a test, more was not nessesary.