Leave on terminate, updated readme
Merge branch 'master' into HEAD