time management
Merge pull request #20 from flyingice/master

time management