Registry and protocol handler change
Merge pull request #1075 from Gravecorp/test

Registry and protocol handler change