Started adding more context managers.
Added CLI utility.
Merge branch 'cli_util'