update dev-master to new version