ticket:4 fix for settings
ticket:4 Merging with master -- settings fixed