Merge pull request 234 from taiki-e/c-metadata