use defined private variable
Merge branch 'master' into lem9-master