log added
Merge origin/master