SoftwareDev/Markus — pull request #10 by SoftwareDev (2014-12-20 02:32:29+00:00)
Title: Revert "Revert "big merge""

Reverts SoftwareDev/Markus#9