Code

Merge branches 'jc/sha1', 'jc/diff' and 'jc/ws'