Bug #57 Fix

Fixed potential Day Light Savings time issues in addition
Merge pull request #58 from gitcac/husain-wip

Bug #57 Fix