merge commits
Merge pull request #954 from eimmirzi/DropDownStrings

Drop down strings