Merge pull request #2 from ewal/new_rules

Too many people are spilling coffee