Issue 398

I added the new rules and a test. This should solve Issue #398.