Merge pull request #413 from igorko/master

Use full path for npcs