some changes
Merge pull request #3 from qatang/dev

some changes