AdaptiveControl: Fixed memory issue
Adaptive control: pushed to synched with daniele