Update to work with extension API changes coming in 1.1.
Merge pull request #6 from DrMarcII/master

Update to work with extension API changes coming in 1.1.