SamR3/ControllerBlock — pull request #21 by GotoLink (2013-07-28 11:24:39+00:00)
Title: Merge conflict fixed

Man, that was such a loss of time.