Added timestamp checks. Fixes #34