Fixed wrong lines commented
Merge branch 'develop'