Fixing neighbors hell
Merge pull request #153 from taigaio/bug/1609/issues-neightbors

Fixing neighbors hell