tadoay's work
Merge pull request #3 from qtang3/work1

tadoay's work