Better output formating
Options added
Table output