Compiler error added to wait statment
Merge remote-tracking branch 'upstream/master'