Finished CLI. Now working with the two versions
Authored by: miguelnunes 2015-01-05
Parent(s): [ef4cc7]
Child(ren): [98c278]