changed timestamp from class to module
Merge branch 'develop'