Added 'tab' command-line option
Added 'id' command-line option