update
Merge branch 'master' of github.com:GiggleLiu/thesis_bc3

'update'