fix template
add required packge
Merge origin/master