refactoring, add comments
Merge remote-tracking branch 'origin/develop' into develop
minor changes
Merge remote-tracking branch 'origin/develop' into develop