Grid implementation of several algorithms (not tested yet)
Merge remote-tracking branch 'origin/develop' into develop