Added extends support
Merge branch 'extends-fix'