Question and Answer has be written  in new style and Unit Tested
Merge remote-tracking branch 'origin/master'