A lot of updates
Merge branch 'Custom-Post-Class-Inheritance'