Merge pull request #18 from cbyn/alex

huge cli refactor