Merge readme changes from master into alpha