modified super methods to be returned from the extend method
Merge remote-tracking branch 'origin/master'