tests
Merge branch 'master' of github.com:zaphod1984/timr