untested data js code
fix merge conflicts
Merge pull request #13 from xiamike/data

untested data js code