Merging NEI to master