convert to data object
done
Merge branch 'master' into gh-pages