Add tags

@fjvallarino this is the official tag style from now on. Please review.