Settings editing
Merge pull request #4 from tanaypadhi/master

Settings editing