Replace wrapper hack with simple inheritance
Merge pull request #7 from groupon/jk/why-not-just-inherit

Replace wrapper hack with simple inheritance