Szune/ErikPacMan — pull request #6 by Szune (2013-12-27 03:19:29+00:00)
Title: Merge fix

Quick merge