Merge pull request #26 from JoyP/master

merge data