Random tweaks
Merge remote-tracking branch 'origin/master'
Fixed compiling issues
Merge remote-tracking branch 'origin/master'