small changes
Merge branch 'master' of https://github.com/xamgems/consort-serve
Merge branch 'master' of https://github.com/xamgems/consort-serve
resolving conflict