Toward v0.5

Add an option