Merge pull request #65 from jgilme1/smallBugFixes

Removed alternate names code and added a filter for NodeID contradiction...
Merge branch 'master' into smallBugFixes