merged readme changes from master