updated dev-branch