Merge branch 'master' into develop
Refactoring + fixed critical bug
Merge branch 'develop'