fix #13, fix #16, add bootstrap