chenge directories
delete comment author
Merge branch 'bugfix' into develop