Merge pull request #1 from aabbcczz/dev

Dev
resolved conflict
Merge pull request #2 from aabbcczz/master

copy from master