removed some comments
Merge origin/master