Merge branch 'dev'
installation of datafile, doc refresh
typo fix, README
Merge branch 'master' into dev