Merge pull request #2 from hype-/master

Doomsday match 2012-12-21
Match 2013-03-08