Merge branch '21-merge-new-api-branch-into-master' into 'master'

Resolve "Merge new-api branch into master"

Closes #21

See merge request concordant/software/c-server!21