added new rules
update from the master branch