Timezone fix for Issue #80

My attempt at fixing broken URLS when timezone support is enabled.  With tests.