added comments-popup
Merge origin/master