Resolves #131 by switching to full bootstrap use