final commit before v0.1.0 (2)