Some improvements.
merged
Merge origin/master