Some more changes
Updating to v0.3