Tzinov - master merge

Doing this with Tzinov.