Added timestamp checking. Closes #38

@pgleeson will that cover your scenario?