Fixed SmartExecutor. Unit tests now working with him
Merge remote-tracking branch 'origin/master'