New rules (fixes #4 #15 #16 #17 #18)
Merge pull request #19 from ilyavolodin/new-rules

New rules