Update readme instructions
Fix build
Merge branch 'master' into pjl-misc