update bootstrap, fix #69, fix #33