Merge pull request #95 from edgy360/master

Fix Inspector locator crashes