Fix #29: implement server-side delimiter

Also fixes #264
gh-29 server side delimiter: review fixes
Merge branch 'gh-29-server-side-delimiter'