second restart
clean up
added simple servers
Merge branch 'master' into HEAD