Updated setup instructions
Merge branch 'rghose-patch-1'