FR#4 – Improve command line interface

History