Merge pull request #1 from ishida83/master

data grid updated