Improved and shortened build instructions
Merge branch 'master' into notifications