wrote 3 tss
Merge pull request #11 from ditkin/master

wrote 3 tss, fixed 2 others