temp logging
changed up adding security protection
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'