Added CLI functionality
Cleaned up CLI code
More CLI code cleanup
Merge pull request #1 from andreyrd/master

Added CLI functionality