work on resolving errors
Merge branch 'master' of https://github.com/dpwivagg/combo