Merge pull request #335 from robwilkens/DataGridBugs1