settings work
Merge pull request #95 from krunalshahmo/master

settings work