Minor edits
Merge branch 'my-copy' of ssh://github.com/medapuram/simpatico into my-copy