just another set of fixes
Merge remote-tracking branch 'origin/master'