npc&object
Merge pull request #32 from esclaveDuReve/master

npc&object