Changing some things back from PR.
Bumped version.
Made CLI tool work with recent changes.