Merge branch 'master' into issue-16
Merge branch 'issue-16' of github.com:adamnagel/qudt-for-domain-tools into issue-16