Synced with Hermes.
Merge pull request #100 from l-korous/master

Synced with Hermes.