commit 1
Merge pull request #1 from qtang3/work

commit 1