methods + tests are added in Time Class
Merge origin/master