Proofreading of code.
Merge origin/master