added skip table option, updated output
Merge commit '74148a7ce4d90c63f2a0801cb9817d640598a8f8'