update

Change-Id: I0fb6831333d33ca2b4736224091ecf8ea396fc62
Merge branch 'master' of github.com:ruanhao/basset