Edited installation instructions
Merge branch 'devel'