updated dependencies

merged develop