Make CLI bits reusable
Bump version to 0.9.4