Issue 484

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