Updated installation instructions
Merged from trunk