Merge pull request #854 from adamarla/master

fixed error
correction to question
Merge remote-tracking branch 'upstream/master'