Fixes #12 - Time zone issue