Code-style refactoring.
Bug fixed.
Merge remote-tracking branch 'origin/develop' into develop