Merge pull request #2 from ratonjuancarlos/new_rules

Too many people are spilling coffee