Minor changes in program structure.
Merge branch 'master' of https://github.com/joloe/bachelor