Merge branch 'master' into dev
Code refactorized
Merge branch 'codeRefactor' into dev
Merge branch 'dev'