Merge with latest changes to main raphael.
Merge branch 'master' of github.com:ExamTime/raphael