Changes for the consumer edition NEO
Merge pull request #3 from Aricg/master

Changes for the consumer edition NEO