some update
Merge branch 'master' of https://github.com/richard-liang/BoP