add restart; change some data
Merge branch 'master' into gh-pages