Refactoring.
Merge branch 'master' of https://github.com/CasparCG/Client