Issue 492

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