Merge pull request #46 from jstac/replace_gridmake