empty args handling, moved text column to end for better readability
Merge remote-tracking branch 'origin/master'