fixes
Merge remote-tracking branch 'origin/new_master' into new_master