Merge pull request #30 from Timeslice42/master

Danke, Timeslice42!!!!!!!!!!!
Fix
Fix Nei Error
Fix silly nei bug
Merge pull request #7 from Rushmead/master

Merge