Fixed NBT Issues.
Merge pull request #80 from smigolpol/master

NBT Fixes.