Make framework extension friendly
Merge pull request #119 from technomage/master

Make framework extension friendly