Merge pull request #1318 from okorach:fine-tuning-and-versioning

Merge pull request #1318 from okorach:fine-tuning-and-versioning #1956