qnaire improved
Merge pull request #285 from UAhmad7/master

qnaire improved