Merge pull request #422 from tuhdo/master

Add nil extension handler