Add auto-bootstrapping
Updated to 5.4 syntax
0.10.0