fixed up timezone conversion and fasting cut-off time
Merge Alan's pull request