Bring up-to-date with latest HERMIT
Merge pull request #1 from xich/master

Bring up-to-date with latest HERMIT