attempt to fix #9
Merge branch 'develop' into new-registry
protocol-spec progress