Szune/ErikPacMan — pull request #7 by Szune (2013-12-27 10:09:22+00:00)
Title: Merge pull request #6 from Szune/stable

Merge fix