commit from dev1
Merge pull request #1 from ChrisKXu/dev

commit from dev1