Made refactor.
Fixed some problems.
Merge remote-tracking branch 'origin/develop' into develop
Removed unused import.