temp logging
changed up adding security protection
Merge branch 'master' into timestamp-fix
included type information
Merge branch 'timestamp-fix' of https://github.com/sharewave/frontus into timestamp-fix
Merge branch 'master' of https://github.com/sharewave/frontus
Merge branch 'timestamp-fix'
possible fix
can be null
Merge branch 'master' into testing