20130910 800ts modification
Merge pull request #5 from gelnicproduction/master

20130910 800ts modification