Merge pull request #1 from luckyboy1102/dev

Dev