Merge pull request #11 from klesta490/master

tsc 1.1