Implemented inheritance
auto-merge staging into master