Bugfix
Merge pull request #1 from Ikkerens/master

merp