Make more subclassable.
Merge pull request #54 from charleswaddell/more-subclassable

Make more subclassable.