remove static variable
Merge branch 'master' into refactor