Catch-up to v0.2-alpha