Added new rules and tests.
Merge pull request #4 from Bowman74/master

Added new rules and tests.
Merge pull request #2 from Magenic/master

Refreshing Fork