ref #21
update var name
close #21
Merge branch 'feature/issue21' into develop