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

Reverts SoftwareDev/Markus#8