trying to fix compiling problem
Merge remote-tracking branch 'origin/fixes' into fixes