vivian's branch
Merge pull request #5 from lxdvs/vivian_huang

vivian's branch!!