caps and etc

dfg
Merge branch 'master' of https://github.com/taier/Life-Helper