Added installation instructions
Merge branch 'master' into develop