Updates to the master script, and more.
Merge branch 'master' of https://github.com/theKGS/conprog-1