More bugfixing
Merge pull request #6 from tomphp/bugfix/merlyn

More bugfixing