changed type and some stats calculation
Merge branch 'master' of https://github.com/demaW/TimeAssistant