Modify for inheritance.
Merge pull request #1 from ambas/master

Modify for inheritance.