Closes #28 (metadata support)