update to new versions from master