Fix Align to Grid
Merge pull request #627 from ethelle/master

Fix align to grid