Fix some details
Merge origin/master