more stuff
merge
Merge pull request #2 from qtang3/work1

more stuff