merge with master
fix conflict
remove useless log file
Merge pull request #19 from qulashi369/yj/merge

Yj/merge