Fixed grid, added paper.
Merge branch 'GridFix' into develop