completed refactoring for timestamp
merging feature/refactor-timestamp' into develop
fixed readme