fixed timestamp
Merge branch 'feature/java-update'