Bug fix : optimization was a bit too earger to optimize
Bug fix : avoid null ref exception
Merge remote-tracking branch 'origin/master'