Merge pull request #166 from DOCGroup/elliottc/combined-custom