Fixed grammar: 'Waiting on' -> 'Waiting for'
Fixed grammar: 'Waiting on' -> 'Waiting for'
resolve merge conflict
fix error during fixing of merge conflict
Merge pull request #593 from Atheros1/master

grammar change