Fixed and add PR
Add PR
->$2->
Fixed bugs, and add Templates