updated dependencies and better scripts
Merge branch 'deps-and-scripts' into develop