20130913 800ts modification
Merge pull request #8 from gelnicproduction/master

20130913 800ts modification