fix
Merge origin/master
add view param