Added Apple branch
Fixed destructor
Added missing file
Misc changes