fix bootstrap and update
fix bootstrap + update
Merge branch 'develop'