Merge branch 'jc/pull'