Code

Merge branch 'jc/shortlog-e'