Adding / Changing things.
Merge branch 'master' of https://github.com/xezno/OpenTSO
Adding / Changing things.