ZTS. Refs gh-108
Merge pull request #112 from piotras/ratatoskr

ZTS. Refs gh-108