Changes for issue #34 Different way of getting user settings, not completely satisfied but it's ok for now