Bring Jia up to date with Metis. Fix #344.
Merge pull request #343 from Locu/jia-metis-update

Bring Jia up to date with Metis