Fix circular dependency
Merge branch 'master' of github.com:meurio/meurio