Updated a comment
Merge branch 'feature/my_test' into develop