Merge pull request #318 from mkorcy/trove

Trove