Issue 418

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