Merge pull request #554 from bittorf/better_neigh.sh