Fix 'ValueError: Cannot compare tz-naive and tz-aware timestamps'
error (bug number 4 in issue #216)