fixed questions
Merge pull request #842 from adamarla/master

fixed questions