t2 branch
Merge pull request #20 from rburakov/t2

t2 branch