Resolve conflicts
Merge branch 'refactor' of github.com:adamnagel/qudt-for-domain-tools into refactor