Fixed Undefined Variable Error
Merge remote-tracking branch 'upstream/master'