Fixed #34

Now it's up to me to remove the settings-files uses to get rid of the special case