some renaming
Merge branch 'master' of github.com:plasmak/mak_grid_project