Issue 529

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