Merge branch 'jc/describe'