Fixed grid checking.
Fixed merge conflict
Merge branch 'master' of github.com:amyzou/RubeWorks