Merge pull request #70 from dcleao/master

Fixes to some extension points.