more updating to dev-master