Merge pull request #9 from qatang/dev

Dev