Refactored code.
Merge branch 'feature/2' into develop