Add tag options, resolves #1