fixes
Merge remote-tracking branch 'origin/Jaspar'
Fixes