put comment and code to separate line
Merge branch 'master'