Merge pull request #220 from fragmer/master

Fixed settings not being loaded properly (embarrassingly easy fix).