updated README with new installation instructions
Merge remote-tracking branch 'upstream/master'