Added command line options.
Changed output on console for more readability.