Merge branch 'dev' into rulesLogic
Temporal checkpoint
Update README.md
Merge pull request #1 from gonzalezkrause/rulesLogic

Rules logic