merged to master updates