Fix CLI

Closes #35 .