Bootstrap upgrade
Merge pull request #12 from doctorfeelgood/bootstrap_upgrade

Bootstrap upgrade