Revert "Too many people are spilling coffee"
Merge pull request #5 from payamd/revert-4-new_rules

"Too many people are spilling coffee"