215: edit comment
merge conflict
Merge pull request #3 from CreativeComments/215-edit

215 edit