Combine 2 functions
update index
Merge pull request #1 from TedCAI/combination

Merge Combination