Issue 430

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