Installation and run instructions up to date
Merge branch 'master' into plain