Add optional end and tag to 0.0.2