Merge pull request #1 from Praeses/docker_branch

Docker branch
Updating generic scripts