init
Merge pull request #4 from qatang/dev

更新20140701