wordOrder: support word-parts. Connections are annotated using "~"s
Merge remote-tracking branch 'origin/master'