Combo enhancements
Merge pull request #1 from scela/master

Combo enhancements