Support for Questions and testing
Merge pull request #6 from hfara079/master

Support for Questions and testing