Updates for ts 0.9.0.0
Merge remote-tracking branch 'origin/master'