Inheritance and NULL added
Merge branch 'master' of github.com:baiche/Tauto