Merge master branch

some comments