Added tags as per #665.