Fixed issue #87, Message Parser removes messages.

Also improved phpDoc and added testcase.
I would blame it more on my parsing abilities than on it being intrinsically unreadable.