Merged Roland's updates to SASSGrid into repo