Issue 500

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