Merge pull request #15 from herbatnik/master

Working timer. :D