Grid fixes
Merge pull request #8 from aleksandarjelicic/master

Grid fixes