CLI now uses flags. Fixes #39