solve some bugs && add some parameters
Merge pull request #1 from ahmad-saad/master

solve some bugs && add some parameters