Implemented class methods (closes #41)