Closed #90 using template_redirect