Revisited cli app (09/09/14)