lots stuff
Merge branch 'master' of github.com:zhy0216/xtimr