Merge branch 'release/1.1.5'
Added basic timestamp tracking.
Added check for missing fields.
fixed conflict
wMerge branch 'guyrt-timestamp-support' into feature/25-timestamp-support
Merged timestamp support, plus added support for numeric timestamps