Fix odd time behavior with the advent of #48
Merge pull request #49 from asenchi/odd-time-behavior

Fix odd time behavior