Merge pull request #2 from pricy/new_rules

Too many people are spilling coffee