Adding new options to CLI

Fixes #2