Bootstrap upgrade

Fixes #164