Out put string and no zero time days
Merge master