add TWView Linear
correct key name
fix bug
Merge branch 'master' into develop