update a lot
Merge branch 'develop' of https://github.com/Kation/ComBoost.git