Grid Working
Merge pull request #6 from herrshuster/master

Grid Working