Fixed typos and erroneous references to variables and methods
Merge remote-tracking branch 'origin/master'