Minor corrections.
Merge branch 'development'