Issue 526

I added new new rules and tests. This should solve Issue #526.