bug fixing
Another update
Memory deallocation
Merge remote-tracking branch 'origin' into feature_ControlSurfaces
More updates