Merge pull request #18 from qulashi369/yj/merge

Yj/merge
merge with master
fix conflict