Inherited controller example working
Merge from github