Refactoring
Merge branch 'master' of https://github.com/MinOptimera/Optimera.Platform.git