Added timestamp support
Merge branch 'dev'