Merge branch 'master' of https://github.com/sledzik1984/cmaservice