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

Make more subclassable.