fixed typos
fixed first sentence
merged changes from master