fix fatal error from overlooked merge prompts
Merge pull request #3 from christianwach/master

fix fatal error from overlooked merge prompts