Implements close #154