Merge pull request #14 from qatang/dev

Dev