added solution and question
Merge remote-tracking branch 'upstream/master'
Merge pull request #639 from adamarla/master

corrections to questions