Merge pull request #3 from filosofisto/new_rules

Too many people are spilling coffee