Merge pull request #2 from ewal/new_rules

Too many people are spilling coffee
Merge pull request #3 from ewal/master

Merge pull request #2 from ewal/new_rules