Added destructor support, documentation fix