Updated combining functions
Merge pull request #46 from childcaremap/anita

Updated combining functions