Tzinov - master merge

Doing this with Tzinov.
Sure, just remember priority #1 is good software methods :smile: