CTest file + some refractoring.
Some refactoring.
Refactoring.
Some refactored code.
Merge branch 'master' of https://github.com/JulianKunkel/siox
Merged changes.