Merge pull request #1 from owen1210/master

600
Merge pull request #1 from DaoD/master

Merge pull request #1 from owen1210/master