Implement timer in storage
Merge pull request #42 from deomitrus/dev

Implement timer in storage