stupid merge bug
Patch for issue 8
Added both rules from the issue report.