Merge branch 'remove_comments' into development
fix nil error
Merge branch 'development'