Merge pull request #1 from yhben/dev

Dev