Quiz pull request from ssherif

Quiz pull request from ssherif