simplify instructions (not quite done yet)
Merge branch 'master' into wolverine