Revert "big merge"

Reverts SoftwareDev/Markus#8