[FINISHED] Tagging

Pull request for #451.