to fetch
fix conflict
compile error fixed
Merge pull request #5 from HandsomeCharming/master

merge