added auto-restart
Merge branch 'yorkuexperiment' into yorkuversion2