Added koenpunt's add-tag options