Add time management
Merge pull request #2 from harenson/add-time-management

Add time management