t3 branch
Merge pull request #23 from rburakov/t3

t3 branch