oct 20 update to master