add timestamp feature
Merge pull request #32 from goinstant/colinmacdonald/22-timestamps

Add timestamp feature
Merge remote-tracking branch 'origin/master' into tmyrden/add-collapse-memory
Updated the way that the null/undefined check is performed