WIP refactoring.
Merge branch 'master' into develop
WIP refactoring
Updated version