Merge branch 'drafts' (closes #1)