small documentation update; removed obsolete variable
Merge remote-tracking branch 'upstream/master'