Refactor to resolve cyclomatic complexity Sonar issue
Merge branch 'master' of github.com:bserdar/lightblue