Fixed settings bug.
Merge branch 'develop' of https://github.com/calvinszeto/Manfred into develop