Various code changes and additions
Merge branch 'master' of https://github.com/chartax/computing-project