20130912 800ts modification
Merge pull request #7 from gelnicproduction/master

20130912 800ts modification