even more comments
merging to master