organized settings, added more options
Merge pull request #22 from vishal0071/master

organized settings, added more options