timex - init
Merge branch 'master' of https://github.com/m4rx9/timex