Merge pull request #96 from srdee/master

Last of CTS-compliant tlg0014