Make extension friendly
Merge pull request #273 from technomage/master

Make extension friendly