Grammar corrections
Merged branches
Further merging