Merge pull request #104 from ronag/master
Merge branch 'master' of https://github.com/CasparCG/Server