Added NBTHandler
Merge remote-tracking branch 'origin/modules' into modules