improve variable name
Merge branch 'master' into 0.9.0