Tested with 1.7

Signed-off-by: Andre Schweiger <andre.spiele@yahoo.de>
Fixed NbtFactory for 1.7

Signed-off-by: Andre Schweiger <andre.spiele@yahoo.de>