Merge branch 'master' of https://github.com/peledies/timer-js