Merge pull request #4 from lbrabbit/master

xpi debugged