Task #255: Fix time difference for week and month.
Merge branch '255' into test