Added support for metadata.
Merge branch 'master' of github.com:KenKundert/mp

Conflicts:
	README.rst