Close Feature #71