Merge pull request #18 from The-Prp/mattbranch

Mattbranch
Merge pull request #19 from The-Prp/mattbranch

Fixes for the grid class.