Merge branch 'media-attribute'. Closes #4.