Move keepworkign code
Merge pull request #23 from jirafe/timeupfix

Move keep workign logic