removed hash
added directiontoneighbor
Merge branch 'master' into dev