Merge pull request #1 from alexanderbazo/master

merging examinationRules with updated master
Merge pull request #2 from alexanderbazo/examinationRules

Merge pull request #1 from alexanderbazo/master