MAS : Align code base with grid, support remote configurations
Merge pull request #22 from sotty/master

Align code with grid 5.5.x