Labyrinth7/Labyrinth7 — pull request #7 by lnxslackware (2014-05-27 12:42:35+00:00)
Title: Fixed merge failure

Please merge