updates
Merge branch 'master' of https://github.com/thinkers/ts
updates 1-5
Merge branch 'master' of https://github.com/thinkers/ts