Changed the type of 'ItemId'
grid method done (without testing)
Merge remote-tracking branch 'upstream/master'
modify calculation of neighbours