4.3 merged code after removing NEI specific changes
Merge pull request #198 from Edzelopez/4.3

4.3 merged code after removing NEI specific changes