Merge pull request #15 from CodeBlanche/master

Timezone bug fix