Removed "ask q" button problem
Merge remote-tracking branch 'origin/master'