added a comment
Merge branch 'new-features'