remove some warnings
Merge remote-tracking branch 'origin/ultimateMaster' into ultimateMaster
final working version