updated to dev-master