Fix timezone bug

closes #7