some fixes and adding shortcut to expand combo file
Merge pull request #1387 from diegosarmentero/master

some fixes and adding shortcut to expand combo file