changes before merge to master