fed up of time zone error, hard-coding mad_due
Merge branch 'dev'