Merge pull request #113 from pengqin/dev

Dev